From: Colin Walters <walters@verbum.org>
Date: Thu, 15 Oct 2009 20:17:18 +0000 (-0400)
Subject: [workspaces] Don't crash trying to get an icon for untracked app
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10738
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=51c41aed90236d8fab5b73baa89684c4e0e3a8b4;p=gnome-shell.git

[workspaces] Don't crash trying to get an icon for untracked app

Use ShellApp directly rather than trying to handle null-safety
with .get_info().
---

diff --git a/js/ui/workspaces.js b/js/ui/workspaces.js
index 217adcf6e..3be0ab39b 100644
--- a/js/ui/workspaces.js
+++ b/js/ui/workspaces.js
@@ -1227,13 +1227,13 @@ Workspace.prototype = {
     _createWindowIcon: function(window) {
         let appSys = Shell.AppSystem.get_default();
         let appMon = Shell.AppMonitor.get_default()
-        let appInfo = appMon.get_window_app(window.metaWindow).get_info();
+        let app = appMon.get_window_app(window.metaWindow);
         let iconTexture = null;
         // The design is application based, so prefer the application
         // icon here if we have it.  FIXME - should move this fallback code
         // into ShellAppMonitor.
-        if (appInfo) {
-            iconTexture = appInfo.create_icon_texture(48);
+        if (app) {
+            iconTexture = app.create_icon_texture(48);
         } else {
             let icon = window.metaWindow.icon;
             iconTexture = new Clutter.Texture({ width: 48,